Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Sep 2011 00:47:29 +0000 (17:47 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Sep 2011 00:47:29 +0000 (17:47 -0700)

Trivial merge